fix: Revert 16794 #16895
Merged
fix: Revert 16794 #16895
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
facundomedica
added
the
backport/v0.50.x
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Comment on lines
677
to
709
|
|
||
| // app.finalizeBlockState.ctx will already be initialized | ||
| // by InitChain or by ProcessProposal. Context is now updated with Header information. | ||
| // Initialize the FinalizeBlock state. If this is the first block, it should | ||
| // already be initialized in InitChain. Otherwise app.finalizeBlockState will be | ||
| // nil, since it is reset on Commit. | ||
| if app.finalizeBlockState == nil { | ||
| app.setState(execModeFinalize, header) | ||
| } else { | ||
| // In the first block, app.finalizeBlockState.ctx will already be initialized | ||
| // by InitChain. Context is now updated with Header information. | ||
| app.finalizeBlockState.ctx = app.finalizeBlockState.ctx. | ||
| WithBlockHeader(header). | ||
| WithBlockHeight(req.Height). | ||
| WithHeaderInfo(coreheader.Info{ | ||
| ChainID: app.chainID, | ||
| Height: req.Height, | ||
| Time: req.Time, | ||
| Hash: req.Hash, | ||
| AppHash: app.LastCommitID().Hash, | ||
| }) | ||
| } | ||
|
|
||
| gasMeter := app.getBlockGasMeter(app.finalizeBlockState.ctx) | ||
|
|
||
| app.finalizeBlockState.ctx = app.finalizeBlockState.ctx. | ||
| WithBlockHeader(header). | ||
| WithBlockGasMeter(gasMeter). | ||
| WithHeaderHash(req.Hash). | ||
| WithConsensusParams(app.GetConsensusParams(app.finalizeBlockState.ctx)). | ||
| WithVoteInfos(req.DecidedLastCommit.Votes). | ||
| WithExecMode(sdk.ExecModeFinalize). | ||
| WithHeaderInfo(coreheader.Info{ | ||
| ChainID: app.chainID, | ||
| Height: req.Height, | ||
| Time: req.Time, |
There was a problem hiding this comment.
Change potentially affects state.
Call sequence:
(*github.com/cosmos/cosmos-sdk/baseapp.BaseApp).FinalizeBlock (baseapp/abci.go:654)
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| @@ -141,8 +141,7 @@ | |||
| require.False(t, finalizeSuccess) | |||
| } | |||
|
|
|||
| _, err = app.Commit() | |||
| require.NoError(t, err) | |||
| app.Commit() | |||
Check warning
Code scanning / gosec
Errors unhandled.
tac0turtle
approved these changes
Jul 10, 2023
julienrbrt
approved these changes
Jul 10, 2023
mergify bot
pushed a commit
that referenced
this pull request
Jul 10, 2023
(cherry picked from commit ebe97e5)
facundomedica
added a commit
that referenced
this pull request
Jul 10, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…fix initialHeight + add ProcessProposal in tests/sims (#16794)"
This reverts commit 0fd6227.
Description
Preparing the ground to make the necessary fixes for VE persistence. We previously thought ProcessProposal was going to be called during block replay, but it's not like that so this previous PR actually broke block replay.
Some of the changes made here are going to be kept but it's easier to revert the entire thing and then cherry pick whatever we want to keep.
Author Checklist
All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.
I have...
!to the type prefix if API or client breaking changeCHANGELOG.mdReviewers Checklist
All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.
I have...
!in the type prefix if API or client breaking change